chore: add details on how to follow the release process - #1682
chore: add details on how to follow the release process#1682zacharyjhankin wants to merge 5 commits into
Conversation
|
|
||
| ## Creating releases | ||
|
|
||
| To create a release, you must create a pull request from the develop branch into 'master' using the 'Rebase and merge' option. Once this has been approved it will automatically run the pipeline to generate a new release. [example](https://github.com/UserOfficeProject/user-office-core/pull/1621) |
There was a problem hiding this comment.
Are we sure about the 'Rebase and merge' option?
I would have thought it would be a normal merge. For example if there were hotfixes on master between releases this option would 'duplicate' the commits from develop by reapplying them on top of master?
simonfernandes
left a comment
simonfernandes
left a comment
There was a problem hiding this comment.
This is a nice change generally, though I have the same query as Joe, as I would normally use the standard merge commit option for both the release and merge-back.
My understanding is also that we'd potentially end up with duplicate commits due to the rebase causing differing commit hashes, which could cause awkward merges.
It'd be good to get another opinion from someone on the ESS side. I think @jekabs-karklins might be a good person to ask. 🙂
4 participants
Description
Motivation and Context
How Has This Been Tested
Fixes
Changes
Depends on
Tests included/Docs Updated?